From 74deb6e0658300867c3d770077cb7331c27c42d4 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 24 Apr 2017 15:37:37 +0300
Subject: [PATCH] Allow test named `test`

Looks like `srt/test.rs` and `src/bench.rs` used to be default
integraion test and benchmark, but they no longer are.
---
 src/cargo/util/toml.rs | 12 ++----------
 tests/test.rs          | 24 +++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs
index 084e2359b..b379567b5 100644
--- a/src/cargo/util/toml.rs
+++ b/src/cargo/util/toml.rs
@@ -1367,19 +1367,11 @@ fn normalize(package_root: &Path,
                                    .join(&format!("{}.rs", ex.name())));
 
     test_targets(&mut ret, tests, &mut |test| {
-        if test.name() == "test" {
-            Path::new("src").join("test.rs")
-        } else {
-            Path::new("tests").join(&format!("{}.rs", test.name()))
-        }
+        Path::new("tests").join(&format!("{}.rs", test.name()))
     });
 
     bench_targets(&mut ret, benches, &mut |bench| {
-        if bench.name() == "bench" {
-            Path::new("src").join("bench.rs")
-        } else {
-            Path::new("benches").join(&format!("{}.rs", bench.name()))
-        }
+        Path::new("benches").join(&format!("{}.rs", bench.name()))
     });
 
     ret
diff --git a/tests/test.rs b/tests/test.rs
index 0e88b949f..9b2563f1e 100644
--- a/tests/test.rs
+++ b/tests/test.rs
@@ -520,6 +520,28 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured
 "))
 }
 
+#[test]
+fn external_test_named_test() {
+    let p = project("foo")
+        .file("Cargo.toml", r#"
+            [project]
+            name = "foo"
+            version = "0.0.1"
+            authors = []
+
+            [[test]]
+            name = "test"
+        "#)
+        .file("src/lib.rs", "")
+        .file("tests/test.rs", r#"
+            #[test]
+            fn foo() { }
+        "#);
+
+    assert_that(p.cargo_process("test"),
+                execs().with_status(0))
+}
+
 #[test]
 fn external_test_implicit() {
     let p = project("foo")
@@ -2849,5 +2871,5 @@ test test_z ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured
 "));
-    
+
 }
-- 
2.30.2